Internal libgeotiff: resync with https://github.com/OSGeo/libgeotiff/pull/118 #10159
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rouault
force-pushed
the
fix_10154_continuation
branch
2 times, most recently
from
cdea40e to
ab8043e
Compare
…typically grads), when reading projection from ProjXXXXGeoKeys Fixes OSGeo#10154 libgeotiff is unfortunately inconsistent. When it synthetizes the projection parameters from the EPSG ProjectedCRS code, it returns them normalized in degrees. But when it gets them from ProjCoordTransGeoKey and other Proj....GeoKey's it return them in a raw way, that is in the units of GeogAngularUnitSizeGeoKey From GDAL 3.0 to 3.9.0, we didn't take the later case into account, and lacked a conversion to degree. And all versions of GDAL <= 3.9.0 when writing those geokeys, wrote them as degrees, hence this GTIFF_READ_ANGULAR_PARAMS_IN_DEGREE config option that can be set to YES to avoid that conversion and assume that the angular parameters have been written as degree.
…typically grads), when writing ProjXXXXGeoKeys Convert angular projection parameters from their normalized value in degree to the units of GeogAngularUnitsGeoKey. Note: for GDAL <= 3.9.0, we always have written them in degrees ! We can set GTIFF_WRITE_ANGULAR_PARAMS_IN_DEGREE=YES to get that non-conformant behavior... Relates to OSGeo#10154
…WRITE_ANGULAR_PARAMS_IN_DEGREE
rouault
force-pushed
the
fix_10154_continuation
branch
from
ab8043e to
e509d34
Compare
|
The backport to stderrstdoutTo backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/3.9 release/3.9
# Navigate to the new working tree
cd .worktrees/backport-release/3.9
# Create a new branch
git switch --create backport-10159-to-release/3.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 2bda0b9659e6c3c2d266a9eed0dc637c38cdc58e,26c163d1938ad4a7ea5de43eea0fa9e4d6ffc7bd,5ecffdf697be4882b39877cf4dd2a0cb91411812,e509d3438e053ffc7c537a95e89d517013348541
# Push it to GitHub
git push --set-upstream origin backport-10159-to-release/3.9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.9Then, create a pull request where the |
|
3.9 backport in #10192 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Continuation of #10158 , with OSGeo/libgeotiff#118 applied